Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 11:56:02 PDT 2014