use 'resource_stream' for compatibility with frozen distributions
Merge branch 'master' into develop