- fixing up the merge conflict
- fixing up the merge conflict

aledbf/kops,gambol99/kops,justinsb/kops,aledbf/kops,kubernetes/kops,robinpercy/kops,robinpercy/kops,robinpercy/kops,gambol99/kops,kubernetes/kops,gambol99/kops,justinsb/kops,robinpercy/kops,aledbf/kops,kubernetes/kops,justinsb/kops,aledbf/kops,gambol99/kops