Merge branch 'release/7.x-0.20' into develop
use drupal_exit to invoke hook exit
updated to version 7.x-0.21
Merge branch 'release/7.x-0.21'