Updates from ShareLaTeX
Merge sharelatex-2014-10-15-1127 into master