Merge branch feature/jorgen.lind/build_fixes_2015_1_0_branch with...

Merge branch feature/jorgen.lind/build_fixes_2015_1_0_branch with refs/heads/1.0 into refs/merge-requests/213/train
3 jobs for !213 with feature/jorgen.lind/build_fixes_2015_1_0_branch into 1.0 in 5 minutes and 23 seconds (queued for 2 seconds)
merge train