Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 13:56:05 PDT 2014