EoD Commit 7-22-14 - FINAL REVIEW