versions
Merge branch 'release'
Merge branch 'master' into 0.3