Reviewed-by: alanb, mchung, psandoz
Reviewed-by: kvn, psandoz
Reviewed-by: shade, dholmes, alanb, chegar, mchung, roland