Merge tag 'gfix' into develop

gplus token update
 sigh
 awwww
sadMerge branch 'release/check'