Merging from areaDetector:master

Importing latest changes from master branch