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