tree edfe41476570c497f609813d2220b57287baafd3
parent f36ff488c0a8fd9c4e03a10c284c0d93cdac234e
parent e239d4dfe9bf748dfcb0e79b4ca09d3c01cdd52b
author Neil Trini Lasrado <nlasrado@gmail.com> 1485516290 +0530
committer GitHub <noreply@github.com> 1485516290 +0530

Merge branch 'develop' into guarding-name