Merge branch 'master' of https://github.com/NSLS-II/NSLS2

   # Please enter a commit message to explain why this merge is necessary,
Merge remote-tracking branch 'github/master' into read_binary