Update source for ndev-stage Aug 20, 2014