Merge results from cloud-admin UI feature dev branch
Authored by: bartpved 2013-01-15
Parent: [r349]
Child: [r351]