Merge remote-tracking branch 'origin/master' into 0.3.x-release