nla/banjo — pull request #669 by ninhnguyen (2014-08-19 01:02:24+00:00)
Title: reorder children

Minor changes to fix DSC-302 and DSC-728