Merge branches 'wip/fix/merge' and 'wip/travis-ci' into wip/merge