Fixes build break from last checkin
Merge branch 'master' into AmazingJaze/listviewstriping