Ensure that prefixed attributes are properly namespaced when reparented
Merge branch 'issue-869'
CHANGELOG updates
CHANGELOG updates