nla/banjo — pull request #466 by terenceingram (2014-05-23 05:05:48+00:00)
Title: Defect DSC-269

Remaining small changes to fix defect.