Merge pull request #210 from doublek/automated-cherry-pick-of-#209-projectcalico-v0.50