Bleeding edge

Merging bleeding-edge into master