Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 21 23:53:49 PDT 2014