Fixed merge snafu.
XC5.1 update