Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 24 20:35:35 PDT 2014