commit 2014-06-30 10-39