commit 2012-04-17