Merge branches 'travis-integration' and 'require-before-monkeypatching' into travis