Make the python 2.6 requirement explicit (Beautifulsoup needs this)
Merge remote-tracking branch 'upstream/master'