merged latest from upstream

@jbalogh; Thank you !