RESTEASY-839
Merge remote-tracking branch 'origin/master_839'