Remove assertGreater, as it's not supported in Python 2.6
Merge remote-tracking branch 'origin/electric'