Prepping for 0.8.6 release
Merge branch 'bwp-0.8.6'