Merge branch 'merge-luke' into libradsec