Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 16:38:45 PDT 2014