fix mixed plans merging data plans; issue #802
Merge remote-tracking branch 'origin/master' into translation