Oops! Did not mean to check the last commit into master directly! Reverting it, and will test on branch.