Merge pull request #259 from jiribroulik/master

ctl upgrade fixes