merge t001 into drwests

nightlies as of 06/15/2014