Merge from ShareLaTeX
Merge sharelatex-2014-10-02-1309 into master