bug 2218 redux - jared1
bug 2247 - jared1
Merge branch 'master' of https://github.com/rptiwari/LaitsV3.git