Merge branch 'nr.dev' into 'ibm-trunk'
authorNeil GM Richards <neil_richards@uk.ibm.com>
Tue, 21 Jun 2016 02:02:47 +0000 (22:02 -0400)
committerNeil GM Richards <neil_richards@uk.ibm.com>
Tue, 21 Jun 2016 02:02:47 +0000 (22:02 -0400)
commitbc1c6a40fce992bfe042b59d9307963683ef467a
tree5275306562618db657c4c756769fa6fa766dcc19
parent2550cc087b526a2ed77a2a9d222f3030ff13ed62
parentf7c60eddd552e7a8683515bccfa1c5baacd840c8
Merge branch 'nr.dev' into 'ibm-trunk'

Nr.dev

Further fixes for customer-reported problems

See merge request !68