Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 21:58:44 PDT 2014