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