merged latest master from @dchest

Thanks!