commit 2014-06-28 12-39