Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 23:38:44 PDT 2014