Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 04:23:51 PDT 2014