Updates from ShareLaTeX
Merge sharelatex-2014-11-21-1742 into master