Emergency commit for Sun Jan 19 07:38:46 UTC 2014. Will explain later.