commit 2014-06-16 10-38