Merge branch 'hotfix/20140523-mora'
DQMP
Merge branch 'hotfix/20140523-dqmp' into develop