Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 09:28:39 PDT 2014