rizwan 10312014-1
Merge remote-tracking branch 'origin/master'