Merging latest from upstream

@toastdriven Thanks!