merge production into master

Minor submodule updates, attempted fixes for Travis