Merged with master from alewolfe