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