0.3.0 squash merge ("rebase") to master
Merge branch 'master' into 0.3.0