Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 10:42:53 PDT 2014