(with feedback from @hnyman and patch additions from @MikePetullo) Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>