commit 2014-06-16 14-47