Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 06:33:37 PDT 2014