Update to 0.17

Approved by:	maintainer timeout
Merge pull request #149 from reallyenglish/mitsuruy

cherry-picked: Update to 0.17