update master to stable/havana