nla/banjo — pull request #526 by ninhnguyen (2014-07-18 01:49:57+00:00)
Title: Fixes for DSC-384

Please check and merge.