[Fix #158] fix bug in PropMemberEnum

- and also in PropNotMemberEnum
Merge branch 'develop' into feature-issues

Conflicts:
	CHANGES.md
Merge with develop
Merge with develop
Merge with develop
Merge branch 'feature-issues' into develop