Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 10:13:42 PDT 2014