Never mind, I followed-up myself and merged this into master. Good catch!