pull to cm-11-20140606-AOJP-NIGHTLY-sc03e