refs #830,831

-- Recommend for Void
Merge branch 'master' of git@github.com:RonBe/loan.git