Merge branch 'topic/taint'
Karen Etheridge [Wed, 11 Sep 2013 23:03:21 +0000 (16:03 -0700)]

Trivial merge