Merge "Properly handle quotes in argument masking" into stable/colorado
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Mon, 26 Sep 2016 16:49:09 +0000 (16:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 26 Sep 2016 16:49:09 +0000 (16:49 +0000)

Trivial merge