incomplete merge of master into windows (requires upcoming changes to master to be complete)

This commit is contained in:
Paul Davis 2013-09-12 11:28:50 -04:00
commit bb826f4bee
153 changed files with 9655 additions and 5514 deletions