Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 05:33:32 PDT 2014