Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 10:28:43 PDT 2014