Updates from ShareLaTeX
Merge sharelatex-2014-12-05-1920 into master