Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 01:33:44 PDT 2014