Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 13:15:45 PDT 2014