Merge branch 'master' of https://github.com/PlatinumScales/Platinum

Change-Id: I887e8dc7ce0f3c080090425bedceb95ef4596ee9
Signed-off-by: Alejandro Alvarado <alejandromc14@gmail.com>