Provide compatibility  check_output for 2.6 (Fixes #2926)
Merge remote-tracking branch 'origin/master'
release 2014.05.16