Updates from ShareLaTeX
Merge sharelatex-2014-12-07-1154 into master