Update to 2014-12-17