Master Ready

Master-ready changes. Please merge and do release to master.

Tests passed: http://build.virtadev.net/viewLog.html?buildTypeId=DBZ_DatabazerCore_CoreBuild&buildId=67