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