• Merge remote-tracking branch 'upstream/feature/GH-732-hot-dog' into f… 

    …eature/GH-732-hot-dog
    @trickpattyFH20
    trickpattyFH20 committed Apr 27, 2018
    5a0d612