Integration

merge integration to master on may-27-2014