And another (:struct ...) conversion
Merge remote-tracking branch 'woudshoo/master' into 0.18.0

* woudshoo/master:
  And another (:struct ...) conversion

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.