2014-09-15 auto-update.
Merge pull request #129 from tobie/2014-09-15-update

2014-09-15 auto-update.