Update to dev-master of imagine/imagine