Resync to Rev. 9744
Merge pull request #26 from heugabel/master

Resync to Rev. 9744