2014-09-12 auto-update.
Merge pull request #127 from tobie/2014-09-12-update

2014-09-12 auto-update.