Updates from ShareLaTeX
Merge sharelatex-2014-10-23-1657 into master