Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 02:40:43 PDT 2014