commit 2014.8.25