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