merged latest from upstream

@rbarrois Thanks!