Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 15:23:33 PDT 2014