Merge develop into master 10/27/14