merge down changes from master

syncing up master and develop