Merge branch 'release/1.0.12'
Fix memoize to include more data to make deviceClasses unique...
Merge branch 'master' into develop
Fix nosetests after memoize changes.
Fix Type arg for zproperties.