merged latest master from Dave

@etianen : Thanks!