Merge branch 'xy_sub_filter_rc' into xy_sub_filter_rc2
Added the small necessary changes to the VS2012 projects