Merge "Make smoketests working again with Python 2.6/nose"