Merge branch 'master' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Merge remote-tracking branch 'origin/devel' into devel
Changed std::tr1 occurences to boost.

std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
Merge pull request #274 from blattms/non-tr1

Changed std::tr1 occurences to boost.
Merge branch 'master' into devel
Merge remote-tracking branch 'origin/devel' into devel