Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 12:54:03 PDT 2014