Merge pull request #617 from Windower/4.1-dev

1/4/2014 Pull