fixed mentions issue #2064103
Merge branch 'master' of github.com:edgeryders/edgeryders-commons