Merge from ShareLaTeX
Merge sharelatex-2014-09-30-1359 into master