commit 2014-06-17 13-51