Added HISTCONTROL=ignoreboth
Merge branch 'release/2.5.1'