(master) make it clearer *where* things should be copied to/from (hopefully)
Merge remote-tracking branch 'origin/master' into journey-builder