Issue#376
Merge remote-tracking branch 'upstream/master'
Issue#376
Merge remote-tracking branch 'upstream/master'
Issue#313
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Issue#386
Issue#386
Merge remote-tracking branch 'upstream/master'
Merge pull request #386 from anoopsjohn/master

Issue#376 & #313