Merge branch 'master' into honeycomb-release