merge master into development #188

Closed dlebauer closed 6 years ago