Merge current GlastDIRAC master