Merge "Salt master support"