Cherry-pick #11308 to 2014.1.1
Use the correct opts
Merge pull request #11309 from basepi/cp11308

Cherry-pick #11308 to 2014.1