Merge pull request #562 from matthewperry/7.x-LIB-38

Add a hidden next button at the top of the form so that it becomes the ...
Merge remote-tracking branch 'origin/7.x' into 7.x-LIB-38