merge
Solve merge with stage branch
different modules - refs BT#7729
merge
Add script to fix bug -refs BT#7827
Merge pull request #25 from danbarretodev/7827

Add script to fix bug -refs BT#7827
Solve a merge conflick