commit 2014.04.16a