Merge branch 'feature/upgrade-fix-dependencies' into develop 2020-01-31 Joel Purra git joelpurra talkie