Merge pull request #1004 from jmaas/master

Fix QA for pull #980
Merge pull request #1005 from jmaas/master

Bump required python version for Koan to 2.6