account for legacy dojo.declare syntax
Merge branch 'dev' into 0.3.1_dev