Happy New Year 2014
Merge branch '0.9-maintenance'