Bleeding edge

Merged bleeding-edge into master