Merge pull request #1 from frappe/develop

7/12/2015 Merge