Fixed compilation errors and warnings for 1.5.#4

pvginkel wants to merge 1 commit into

pethin:masterpethin/noisy:masterfrom

pvginkel:fixes-for-1.5pvginkel/noisy:fixes-for-1.5Copy head branch name to clipboard