ADEN-502 Hack
Merge pull request #1506 from Wikia/release-187-aden-502

Release 187 aden 502