syncing release with master #16

Closed prasanth-pulla closed 7 years ago