Merge branch 'hotfix/20140714-dodonto'
dka-hero
Merge branch 'hotfix/20140715-dka' into develop