Merge staging issues into master #705

Closed mtedeschi closed 6 years ago