Icicles support by default.  Requires package-install
Merge branch 'release/6.3.0'