update
Merge branch '2014q4' into gh-pages