Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 15:54:48 PDT 2014