Merge branch 'master' into bjh21-php-hashmap