Issue #313: [1.9.0.0] Only one payment method is enabled
Merge branch '1.9.0.0' of https://github.com/acharrex/magento-core-ce into 1.9.0.0