Merge pull request #111 from TheBlueMatt/2018-08-full-stack-target-upstream-1