Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 15:09:52 PDT 2014