Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 20:23:41 PDT 2014