Merging recent changes from staging to master.