10671: Merge branch 'master' into 10671-pipeline-instance-finish-time
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 21 Dec 2016 17:28:41 +0000 (14:28 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 21 Dec 2016 17:28:41 +0000 (14:28 -0300)

Trivial merge