Merge pull request #1598 from JeffProgrammer/glpboimprovement