WIP | Trying to get green travis builds

Created by: dzaporozhets

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com