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