Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 01:38:49 PDT 2014