Merge branch '20141210-homepage-image' into staging