Merge development branch results + a bit of file restructuring.
Authored by: bartpved 2013-01-11
Parent: [r348]
Child: [r350]