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

Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>