Frameworks/Epics/Qt 5.1 Merging