Merge develop into master 10/23/14