Merge branch 'master' of https://github.com/dsutoyo/hybrid-add-ons
Merge branch 'master' of https://github.com/dsutoyo/hybrid-add-ons