Merge branch 'hotfix/20141014-yimg'
adnxs.com
Merge branch 'hotfix/20141014-adnxs.com' into develop