Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 11:03:47 PDT 2014