added missing constants for padding
Merge branch 'master' into ext-tags