Uncomment include dirs on CMakelists
Add 'with_bounty' flags
Merge branch 'bounty' of https://github.com/TheBounty/blenderbounty into bounty
Merge http://git.blender.org/blender into bounty
Fix T42081, OpenCL supports float3 since the 1.1 specification, not sure why we needed this.
Cycles: Center Tile order had a slight offset to the left.

Signed-off-by: Thomas Dinges
Fix T41983: Array Modifier "Merge" bug?

We messed up previous fix, in 'simplified' translated merge case... :(
Quiet warning on 32bit system
Fix T42093: segfault when trying to free unallocated depths zbuffer (border-zoom in 3DView).

Thanks to jensverwiebe (jens verwiebe) for investigations too!
Dyntopo: minor speedup collapsing edges
Merge branch 'bounty' of https://github.com/TheBounty/blenderbounty into bounty
Merge http://git.blender.org/blender into bounty