Merge "fix wrong behaviour of SelectNone()" into devel/master