rizwan 10232014-3
Merge remote-tracking branch 'origin/master'