I merged this manually rather than ask you to rebase. Sorry for taking so long.
Pull-Request has been closed by tibbs