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