Synchronizing Facet with drunken commit last night
Another attempt
Merge remote-tracking branch 'origin/master'
More synch