Merging change from meanalysis-74x into sync_spring15 #47

Closed gkasieczka closed 9 years ago