Updates from ShareLaTeX
Merge sharelatex-2014-10-28-1340 into master