Merge pull request #1 from Mirantis/fuel-3.1

Fuel 3.1
Merge pull request #12 from tylerregas/fuel-3.1

Merge pull request #1 from Mirantis/fuel-3.1