Merging dev into master to reflect changes from past few days