Merge branch 'gsoc-ifdef-cleanup' into gsoc-app-target