Merge of "modules/custom/branches/1.2.x@16514" to "modules/custom/branches/1.3.x@16504".
Conflicts:
- units/widgets/widget_eh.php
 
Merge of "modules/custom/branches/1.2.x@16514" to "modules/custom/branches/1.3.x@16504".
Conflicts:
| alex | Jan 20 2017, 2:25 PM | 
| Buildable 661 | |
| Build 661: After New Commit (Harbormaster Build Plan) |