Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 12:38:46 PDT 2014