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