Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 05:47:35 PDT 2014