Upgrade some of the things

akwizgran requested to merge upgrade-dependencies into master Sep 26, 2018