Changes made in ShareLaTeX
Merge sharelatex-2014-10-03-1306 into master