Merging in development fixes into master.