Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master' of git://github.com/primalmotion/Archipel
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
add vmparking into pydocs
Merge branch 'master', remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'