backup commit 2013-06-26 22.21