commit by thettian 2013-09-24