Merge remote-tracking branch 'origin/master' into better-fabfile
Merge branch 'better-fabfile' into master; see issue #1