Merge "Fix for CMAS is not turned on" into lmp-dev
xinhe [Wed, 1 Oct 2014 22:10:37 +0000 (22:10 +0000)]

Trivial merge