Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Rename Orientation to CCOrientation and rename the enums
Merge pull request #162 from mono/master

Rename Orientation to CCOrientation along with enum values