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