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