dka-hero
Merge branch 'hotfix/20140715-dka'