Merge tag '1.6104'

Tagging version '1.6104' using shipit.
Merge branch 'devel'

an empty message aborts