Merge Develop with the Master

Any objections to pushing the updates to the live site?