Merge branch 'master' into lukeh/moonshot