+1 Looks good!
@mkovarik Could you rebase this? After that, once the C3I tests pass I'll merge it.
rebased onto 648e76c7e4aa0ba61047c57f200092384c5aee4b
Pull-Request has been merged by mikeb