Fix: Trying to make Travis-CI build pass.
Fix: Travis-CI build now passing.
Merge branch 'master' into patch-1