Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 08:24:38 PDT 2014