Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 06:57:41 PDT 2014