Merge branch 'master' into 0.3.7_dev