Imported Upstream version 0.3.dev70.g8e36624