Updates from ShareLaTeX
Merge sharelatex-2014-12-20-1453 into master