https://github.com/cloudspokes/arena-web/issues/539
Merge pull request #842 from flytoj2ee/master

https://github.com/cloudspokes/arena-web/issues/539