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