Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 04:35:14 PDT 2014