commit 2013-5-31 note