Check for existance of attributes.
Merge branch 'master' into 2.1