Merge branch 'topic/legacy'
Karen Etheridge [Thu, 30 Oct 2014 18:55:51 +0000 (11:55 -0700)]

Trivial merge