r53
Merge branch 'master' into forivall-changes-ng