Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 03:03:50 PDT 2014