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