Merge from ShareLaTeX
Merge sharelatex-2014-10-01-1413 into master