Companion update to main repository

This is an update with changes applied from https://github.com/abstractfactory/pyblish/pull/102