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