Manually updating versions.
Merge branch 'next-master'
Tagging dev as 0.3.8-dev.