Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 18:17:47 PDT 2014