Updates from ShareLaTeX
Merge sharelatex-2014-12-12-1921 into master