Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 20:43:50 PDT 2014