Bi-Weekly Pull Dev to Master 12/11/2014