Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 14:12:45 PDT 2014