Updated popover behaviour some more.
Merge remote-tracking branch 'origin/master' into release
Updated assets