Committing changes of 20130910-1547.

As of 10 September I've set this project aside.