Merge branch 'hotfix/20140926-fixdup'
jpddl
Merge branch 'hotfix/20140926-jpddl' into develop