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