merge w/ latest pyspacebrew