Update
:wq
gerge branch '2014q4' into gh-pages