Merge current develop into master #1

Closed cgmorton closed 9 years ago