Committing in order to get Nathan's merged devel

Author: @akshoop