20140915 - Catching up from local tree
Merge branch 'master' of github.com:CRNDEV14-04-00-00/CM-Build