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