Reverse Merge Request

Merged sarah.grebing requested to merge master into 55-add-variable-view-to-goaloptionsview Nov 22, 2018