Updates from ShareLaTeX
Merge sharelatex-2014-11-16-1910 into master