commit 2013-06-11 3