Missing part of tajaran ear commit.
Merge pull request #2237 from CIB/master

Fix to tajaran commit