Fixing up the g+ icon and a merge conflict which went unnoticed :-/