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