Updates from ShareLaTeX
Merge sharelatex-2014-10-16-0922 into master