10671: Merge branch 'master' into 10671-pipeline-instance-finish-time
authorLucas Di Pentima <lucas@curoverse.com>
Mon, 19 Dec 2016 20:58:13 +0000 (17:58 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Mon, 19 Dec 2016 20:58:13 +0000 (17:58 -0300)

Trivial merge