Merge Master into EMSoft branch #4

Closed bjack205 closed 9 years ago