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