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