Merge from dev1 to stable branch at Wed, 23. Jan 2013 05:12PM