Merge pull request #1113 from dennishendriksen/master

Forward port #2416 rename 'order' to 'submit'