Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 03:23:45 PDT 2014