Merge from ShareLaTeX
Merge sharelatex-2014-09-12-1312 into master