Mantle 0.3
Merge pull request #1311 from jsclayton/master

Mantle 0.3