BLOG-38 | Fix build failed on travis-ci
Merge branch 'bugs/BLOG-38-travis-build-failed'