Commit 2014-12-17