changes from loxigen e8e6401509

Reviewer: @rlane