Play catchup with master

@tyler-ball @sersut