timglass

@motiz88 please could these PR's be included in the next release so that we can resolve the security alerts that many projects are now receiving?