Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 19:54:41 PDT 2014