updating develop with pulls to master

[ithiele]

Please include a short description of enhancement here

I hereby confirm that I have:

• [ ] Tested my code on my own machine
• [ ] Followed the guidelines in the Contributing Guide
• [ ] Selected develop as a target branch (top left drop-down menu)

(Note: You may replace [ ] with [X] to check the box)