Upstream changes

Automatically opened by http://forkbomb.io
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.