update for June branch
Merge branch 'master' of github.com:jalmond/LQanalyzer