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