Merge to master 12/16/13