Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 16:48:46 PDT 2014