Merge branch 'topic/plugin_load_fixes'
Karen Etheridge [Tue, 26 Mar 2013 16:36:47 +0000 (09:36 -0700)]

Trivial merge