Hotfix/2013 12 10

hotfix branch to replace #1905 and #1902