Integration

This is a promotion from integration to trunk on github - I would like to see it done as a fast forward merge