Backport 336093 from branches/1.8

Change-Id: I5f8e0313ca329241af54103af52732e126e7ea20
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Backport r344539 from branches/1.8

Change-Id: I91aeded6160b6ecf977c454d33ff056753518263
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Properly document previous patches

Change-Id: I608847b499795ef8bdcf99d50d66665732c0aeb4
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>