Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 13:52:08 PDT 2014