Merging changes made directly in master back into dev.