quick fix for php notice
Merge branch 'quick-fix-for-php-notice' into dev