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