fix for popovers
Merge branch 'master' into reference_relationships