Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 04:44:11 PDT 2014