Merge from ShareLaTeX
Merge sharelatex-2014-09-11-1217 into master