Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 23:39:47 PDT 2014