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