5.6 Support

Think this is what I was really after in #802.