Updates from ShareLaTeX
Merge sharelatex-2014-12-19-1435 into master