RESTEASY-839
Merge remote-tracking branch 'origin/master_839'
Merge pull request #380 from ronsigal/master

master