Add missing dep for Travis
Merge branch 'master' into develop