Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 07:08:37 PDT 2014