Merge darkrain->trunk