t push origin masterMerge branch 'ap-fix-prepare-query-parameters'
John Napiorkowski [Tue, 17 Feb 2015 01:52:10 +0000 (19:52 -0600)]

Trivial merge