Drone

Merged username-removed-65452 requested to merge gh-ad27c542/12/spacecowboy/drone into master Jul 24, 2016