Updates from ShareLaTeX
Merge sharelatex-2014-12-06-1133 into master