Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 07:48:43 PDT 2014