Update from 2014.12.29