Commit 84a70033 authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'changeset_merge_cancelout' into 'master'

Changeset merge cancelout

See merge request !816
parents 15696fe6 e07750ba