commit 2014-10-21 13-26