Resolved merge conflict with johnwmcc's latest pull request.