Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 00:38:42 PDT 2014