Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 01:33:44 PDT 2014