Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 20:08:45 PDT 2014