Merged devel to master, RC for bigpandamon-atlas-0.0.18