Merge tag 'suppress-php-notice' into develop

Small fix to remove notices
Merge branch 'master' into develop