commit 2014-06-17 12-51