update nrnb:master with latest work from ap:master