Grizzly merge

This pull request brings the module up-to-date with master of the stackforge version of this module as of: 5/29/13