Update Master to latest stable code with Bugfixes.

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.