Commiting for merge.
Merge branch 'master' of https://github.com/vbarua/QDG-Lab-Framework
Cleanded up auto-merge.