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