Commit 88f140b0be3c09accc30bdb9195ec1d3e9669e28

James Hilliard 2014-07-03T09:39:19

merge upstream frequency changes