Updates from ShareLaTeX
Merge sharelatex-2014-12-08-0906 into master