Merge development to master 1/23/14