Fix compatibility with WooCommerce Payment Gateway Roles (and possibly others)
Merge branch 'mdeboer-master'
Minor style change.