GSoc Code Merged Into Branch

[Robert Burrell Donkin]

After quite a battle, hopefully everything has now been committed onto 
the branch. Please dive in and take a look, if you have a few spare cycles.

Robert