Commits

[svn-r28604] Merge with 1.8 branch. Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 & CMake 3.3.2 serial only, CMake only
[svn-r28604] Merge with 1.8 branch. Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 & CMake 3.3.2 serial only, CMake only