Minor enhancements following further testing.
Authored by: philsp 2013-12-12
Parent: [r2923]
Child: [r2925]