Minor changes for PM usage consistency.
Minor changes for PM usage consistency.
some API consitency enhancements (introduced for the tutorial)
PmAttrBase: Default values are only applied for enabled attributes.
import/stash conflict resolution
Merge commit '4547861bd0fdc14c2f9a19c88'
prepare v0.5.7
prepare v0.5.7
Merge commit 'dff2514e5aa6dfc425e622c8a1a5d7'

Conflicts:
	pom.xml