Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 13:25:39 PDT 2014