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