commit 2014-05-30 10-17