Merge pull request #931 from anilgooru/master

Resolved conflits
Removed error conflict.
Merge remote-tracking branch 'upstream/master'

* upstream/master: