Merge branch 'master' into prod
Merge branch 'prod' of https://github.com/popox/ShotHere into prod