Update content class for 2014-05-29
Merge branch '2014-05-29'