Merge branch 'release/2013-09-18'
Inherit task resource from base task resource
Merge branch 'hotfix/fix-tas-resource' into develop