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