commit 2014-08-30 21-22