Sync with mockee/istatic:master