Updated res
Merge pull request #3233 from mmottl/master

Updated res