Bring inline with upstream master
remove rogue var_dump
Merge branch 'develop'