Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 05:53:43 PDT 2014