Feature-complete, ready for merge with trunk.
Authored by: bartpved 2012-12-18
Parent: [r336]
Child: [r338]