2.0.x

Update fork to most recent 2.0.x branch