merge with future 5.6.0 There is only minor test output change, 4.0 do not have the "trouble:" wording in there.

from __future__ import absolute_import
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)