fix shutterbug path
Merge branch 'master' into staging

* master:
  fix shutterbug path