Merge branch 'hotfix/20140829-jordan'
FF14 eriones
Merge branch 'hotfix/20140829-eriones' into develop