Gsoc

Hopefully this should include the latest from trunk.

Robert