Merge "Final Colorado document review. - Please review the rendered HTML document...
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Tue, 6 Sep 2016 13:35:07 +0000 (13:35 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 6 Sep 2016 13:35:07 +0000 (13:35 +0000)

Trivial merge