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