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