Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 09:37:37 PDT 2014