Updates from ShareLaTeX
Merge sharelatex-2014-11-11-1456 into master