Fix #286: test system doesn't work with python 2.7.6
Merge remote-tracking branch 'origin/stable' into stable