Development merge 11/23/14