Ayush Jha - 2016-04-26

This is the patch for Feature Request #1274.