move master info code to a common spot
Merge branch 'indigo' into hydro-devel