Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 05:53:41 PDT 2014