broken variable shift

not totally clear why this was necessary. Did google change the places
API today?
Merge branch 'master' into gh-pages