change syntax to 2.6
Merge branch 'release/publish-20140929' of github.com:MadeiraCloud/cli into release/publish-20140929