Merge branch 'release/2.4.0'
should fix xctool failing due to pods missing deps for test targets
Merge branch 'hotfix/2.4.0.travis' into devel