fixes from 12/3/14 meeting
fixes from 12/3/14 meeting
Merge remote-tracking branch 'upstream/master'