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