Revert "Revert "Merge from Master""

Reverts Fox-McCloud/Paradise#45