Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 31 15:39:34 PDT 2014