Updates from ShareLaTeX
Merge sharelatex-2014-12-18-1541 into master