Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 22:03:42 PDT 2014