Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 13 03:13:44 PDT 2014