Updates from ShareLaTeX
Merge sharelatex-2014-11-23-1651 into master