Merge branch 'master' of https://github.com/tostasqb/xtatic
Merge remote-tracking branch 'origin/master'