cc
Merge branches 'master' and 'ccReservationFix' into ccReservationFix
Merge pull request #177 from joh641/ccReservationFix

Cc reservation fix