Added required Python version 2.6 guard in ert/__init__.py
Merge remote-tracking branch 'upstream/master'