Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 09:18:46 PDT 2014