Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 16:34:08 PDT 2014