bug 945
Merge pull request #1 from kkorekk/bug_945

bug 945
bug_949
patches
patches 2
patches 2, correct pep8
Merge pull request #2 from kkorekk/bug_949

bug_949
bug_950
bug_950
bug_956
bug_956, tests
bug_950, patch 1
bug_950, path 1
Merge pull request #3 from kkorekk/bug_950

Bug 950
buildout support
Merge remote-tracking branch 'upstream/master' into bug_956
bug_956, patch 1
Merge pull request #4 from kkorekk/bug_956

Bug 956